bitkeeper revision 1.1159.212.13 (41df3794swb64JdEQfvPveHTBypSAg)

Revert bogus shadow mode 'fix'.

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index 0f66ca8cd0291db9d490d0537c72dda4cab86b02..0245a05e2789f7119daa90bb9413b969d6d33010 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -539,10 +539,10 @@ static void shadow_map_l1_into_current_l2(unsigned long va)
         __shadow_set_pl2e(m, va, spl2e);
 
         gpl1e = (unsigned long *) &(linear_pg_table[
-            (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
+            (va>>L1_PAGETABLE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)]);
 
         spl1e = (unsigned long *) &(shadow_linear_pg_table[
-            (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
+            (va>>L1_PAGETABLE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)]);
 
         for ( i = 0; i < ENTRIES_PER_L1_PAGETABLE; i++ )
             l1pte_propagate_from_guest(m, &gpl1e[i], &spl1e[i]);